From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 19 Feb 2013 17:16:16 +0000 (+0000)
Subject: Merge "phpcs: Normalize methods declarations to "[final abstract] [visibility]"."
X-Git-Tag: 1.31.0-rc.0~20649
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=1a6a9dd4b18a1dce5fade2e3d66dbb8e72cd2664;p=lhc%2Fweb%2Fwiklou.git

Merge "phpcs: Normalize methods declarations to "[final abstract] [visibility]"."
---

1a6a9dd4b18a1dce5fade2e3d66dbb8e72cd2664
diff --cc tests/parser/parserTest.inc
index b9bb33fdf0,6b56dcf585..aa56e6e3f1
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@@ -228,10 -227,11 +228,10 @@@ class ParserTest 
  	 * Remove last character if it is a newline
  	 * @group utility
  	 */
- 	static public function chomp( $s ) {
+ 	public static function chomp( $s ) {
  		if ( substr( $s, -1 ) === "\n" ) {
  			return substr( $s, 0, -1 );
 -		}
 -		else {
 +		} else {
  			return $s;
  		}
  	}